bitkeeper revision 1.1083 (40f54b0a40pzYjUMzMokIXYQ7fyBgA)
authoriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Wed, 14 Jul 2004 15:02:34 +0000 (15:02 +0000)
committeriap10@labyrinth.cl.cam.ac.uk <iap10@labyrinth.cl.cam.ac.uk>
Wed, 14 Jul 2004 15:02:34 +0000 (15:02 +0000)
Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk

1  2 
xen/arch/x86/domain.c

Simple merge